From 4a0f78b72fa98cad4c4befed4e6f1527006b66e3 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 21 Aug 2009 19:02:38 +0200 Subject: [PATCH] Bug 592606 - Activate the default button in a respose-request callback Previously the rightmost button with a proper response id was activated, this is now only done if there is no default button set. With this patch the right widget gets activated when there are multiple widgets wth response ids conforming to is_stock_accept_response_id() as the selected widget is made the new default widget before showing the overwrite confirmation dialog. --- gtk/gtkfilechooserdialog.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c index 0868691e22..2dd3737154 100644 --- a/gtk/gtkfilechooserdialog.c +++ b/gtk/gtkfilechooserdialog.c @@ -224,6 +224,11 @@ file_chooser_widget_response_requested (GtkWidget *widget, { GList *children, *l; + dialog->priv->response_requested = TRUE; + + if (gtk_window_activate_default (GTK_WINDOW (dialog))) + return; + /* There probably isn't a default widget, so make things easier for the * programmer by looking for a reasonable button on our own. */ @@ -239,12 +244,14 @@ file_chooser_widget_response_requested (GtkWidget *widget, response_id = gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog), widget); if (is_stock_accept_response_id (response_id)) { - dialog->priv->response_requested = TRUE; gtk_widget_activate (widget); /* Should we gtk_dialog_response (dialog, response_id) instead? */ break; } } + if (l == NULL) + dialog->priv->response_requested = FALSE; + g_list_free (children); } -- 2.30.2